Fixed discussed require statement and regular expression from PR #1944