less intrusive fix