* fix data checking