Fix for breaking API change from routing