Fix adaptive
Merge branch 'vladimir'