Fixed parsing a little better