added isActive again