Include PR #2323 for wrong config check

Include fix #2323 in this PR.