Fix for emulator