fixed issue where was calling wrong methods on emulators