working on routing bugfix