New fix for width and height