fixing activation hooks