Bugfix/3117 directory order