Fix epic crazyness

The fork had an error throwing on route change which caused crazy shit to happen