Made app emulator compatible :)