resolved CALC-307