data path bug fixed