Calculator fixed