NATIVE-1, bug fix