Fix calculator impl