rerolled pull request 478