fixed message matching