Added handling for active.