fix isActive