fixes CC-347
Merge pull request #1319 from control-center/fix/CC-347a

fixes CC-347