Another attempt at fixing the double URL bug