Fix for width and height