apply pull request 28e26bc (vinoski) issue #9