fix record check condition
Merge branch 'web_feature'