Calculator
	-bug fix