fixed CAT-1217, probably timing problems on emulator