Actions and events flush Fix