Included suggestion from the PR