SUPA-879 calc answered while clearing bugfix