fixed bug on activation