Fix for es-native client