Fixing router injection, this time for real