#6 - fix activation