Geometry event dispatcher base class fix