data path fix