Fix in-controller routing for edge cases

Signed-off-by: Tyler Menezes <tylermenezes@gmail.com>