Improved _activate handling
1.0.3