Fixed parsing return value