Made a tweak as recommended in the PR 1951