fix data passing