Calculator 2

Fixed logic error