Fix isActive logic