fixing public match service