Resolved index bug in DefaultRouter