Fix calculator (4/24)

Fix calculator