YBO: Fix for SIM 1.3.