FIX conditinnal directory creation