Fixed calculator's input problems