Fixed parsing issues.