fix for MESOS-1688