Feature/fix ngroute