Fix duplicate event messages