wip events fix