Fix for automatic URL