fixed issues with native override