Fixed for NativeApp