restore lost handler.stop calls