Fixed parsing options