CustomUrlGenerator fix