Fixed problem with mixing events