Fix CIDCW for non-native calls only