Fixed bug with calculator related to alert #99