tweak to FixDataPath