don't remove extend, dot needs it
fix test
Merge branch 'fix' into 'master'

don't remove extenddir
Merge branch 'master' into test