fix performance issues caused by staged message handling