Fixed double activation bug (Hopefully...)