Manual fix for pull request 426