Another parser bug fix