Fixed annoying activation issue step 2 (2/2)