Fix for MESOS-1688