fixed calculator issue