fixing currentRoute()