Removed changes of pull request #21