Fix for FLINK-929