Fixed parsing bug