MX-11 scenario fix to top it off.