Fix missing handling of + and -