Maybe fixed conflicting events bug