Fix for url generate