Got it right for ios emulator and device

(no hot code push yet)