Fixed IsActive refactor