Fixed bug where it adds to active twice