Issue #85 , fixed routes