The fix in base simulator