Fix by comment of pull request