patch for new router scope handling