fixed data path bug