fix data finder