Fixed parsing bug in Parse method as well