Native API reference issue fix