Fix problem with pull request #388