New calculator fix