parser bug fix
new parser implemented