Added depth for null width/height too