Merge branch 'fix_param_check'