Fix to router multiplex issue