Fixing data path.