Fixes #216

Fixes #216: Instant activation not working as expected
Merge pull request #445 from PenguinPaul/fix-261

Fixes #216: Instant activation not working as expected