fix parser bug
merge