Fix for urls