Fix guest master not setting properly