Fixed data path bug