Fix activation's bug