Optimize activate
Merge pull request #128 from hstkk/activate

Optimize activate