Bug fix for OSX emulator on release-0.7.0 branch.