Rework of pull request #1