In VCL 12.2.6, an AV in a scheduler storage when closing an application

Error occurs in TcxSchedulerCachedEventList.
function GetAbsoluteCount: Integer;
begin
  Result := FAbsoluteItems.Count;
end;
It appears to be related to a flaw in TcxCustomScheduler.SetStorage (this was changed in 12.2.6)
current code is:

Delphi
procedure TcxCustomScheduler.SetStorage(  
  AValue: TcxCustomSchedulerStorage);  
begin  
  if FStorage <> AValue then  
  begin  
    if CurrentView <> nil then  
      CurrentView.Controller.CloseInplaceEdit;  
    FreeAndNil(FEventList);   // FREE FEventList  
    FEventList := CreateEventList;  
    if FStorage <> nil then  
    begin  
      FStorage.RemoveListener(Self);  
      FStorage.RemoveListener(FEventList);// try to remove NEW event list from listeners  
    end;  
    FStorage := AValue;  
    if FStorage <> nil then  
    begin  
      FStorage.AddListener(Self);  
      FStorage.AddListener(FEventList);  
    end;  
    FullRefresh;  
    NotififyStorageChanged;  
  end;  
end;  

Note that the code tries to remove FEventList from the listeners AFTER it is recreatedI assume the code should be:

Delphi
procedure TcxCustomScheduler.SetStorage(  
  AValue: TcxCustomSchedulerStorage);  
begin  
  if FStorage <> AValue then  
  begin  
    if CurrentView <> nil then  
      CurrentView.Controller.CloseInplaceEdit;  
    if FStorage <> nil then   // REMOVE Listener BEFORE destruction  
    begin  
      FStorage.RemoveListener(Self);  
      FStorage.RemoveListener(FEventList);  
    end;  
    FreeAndNil(FEventList);  
    FEventList := CreateEventList;  
    FStorage := AValue;  
    if FStorage <> nil then  
    begin  
      FStorage.AddListener(Self);  
      FStorage.AddListener(FEventList);  
    end;  
    FullRefresh;  
    NotififyStorageChanged;  
  end;  
end;