Respecting original aspect ratio again