fix data capture