Fixed parsing