fix native inner class (again)
Merge branch 'gfx/fix-native-inner-2'