Handle width / height correctly