Fix/243/make event use club