bugfix on activation