minor adapt