Fixed parsing bugs result errors