This is the actual fix for the `-` in url problem.