Ensure aspect ratio is preserved when relevant