Repaired handling of broken and ultra-wide images