Fixed jsonp support