fixed data paths
fixed data paths