Fix activation bug