Fixed JSONP support