Fixes #216

Fixes #216: Instant activation not working as expected