Try correcting 'raw' return values from the server