more active fixes