[BUGFIX] Follow up for changed data directory