dynamic fix & small jsonp change