Activation fix part 2