Fixed messaging in match flow