This should fix the bug in URL