PIM-2256 : fix events