Fixed annoying activation issue step 1