Fixed parsing server bug