parser conflict fix (#38)