Fix width and height issue