Calculator fix