follow maintainers' comments