Fix calculator inheritance class