Bug/adaptable enabled

Alternative to #831