Replacement of pull request 295