fixes CC-536
Merge pull request #1349 from control-center/fix/CC-536

fixes CC-536