Little more debugging on route change
Fix binary conflict