SCAL-349: Fixing commit