Fixed serialization to JSONP