fix dirMode
Merge branch 'develop'