(parser) temporary manual fix of short circuit evaluation