fixes some really weird problems with activation