Fix MT #05780
Fix for Godzilla too