Bug fix, + and -