#66 fixed routes generation