Trying to fix parser bug