#CALC-7 fixed