Fixed the url specific bug