Dirk minor fix for event layer in client