Fix for url replacement