Issue #125: parser fix