Fixed issue with activation dependencies