#364 added missing route following merge