Issue #41 #97 route fix