Added AutoActivate flag