Fixing URL Generator Bug