handle routing properly in lone-master case