Fixed parser bug