fixes for reussing message