VIX_161: Fix to make data_dir work as expected.