SCAL-484 - fix after merging