fix of data folder handling