EventStorage closeEvents fix