[BUGFIX] Do not create folder in wrong directory