Fix in emulator