fix bugs
Merge branch 'fix_check' into dev