Fixed '+'/'-' parsing