Better support in emulator (workaround)