diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnListener.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnListener.java
index 045ea53400e838866c7de56d8693ab38b9b11097..d3c45e25b2e45a095ca56f444268b02f8e7bcfc7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnListener.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnListener.java
@@ -67,12 +67,12 @@ public final class ColumnListener<T, M extends BaseEntityModel<T>> implements
      */
     @Override
     @SuppressWarnings("unchecked")
-    public void handleEvent(GridEvent be)
+    public void handleEvent(GridEvent<?> be)
     {
         ICellListener<T> listener = getCellListener(be);
         if (listener != null)
         {
-            ListStore store = be.getGrid().getStore();
+            ListStore<?> store = be.getGrid().getStore();
             listener.handle(((BaseEntityModel<T>) store.getAt(be.getRowIndex())).getBaseObject(),
                     WidgetUtils.ifSpecialKeyPressed(be.getEvent()));
         }