Fixes the ShortURL problem
Merge pull request #711 from terwey/CS-5411

Fixes the ShortURL problem