Yet more issues with the -1 width/height transformation -- this time, fix