fixes CC-394