fixing activation events