fixes CC-536