fix storage for stop event and flag