Big fix: Default directory option does not work properly