Fixed parsing of return string