Fix routing with workaround. Needs more work