FLINK-1276

Fixes FLINK-1276