Fixing *HelperRoute classes
Merge pull request #1708 from Hackwar/2.5.x

Fixing *HelperRoute classes