update for pull request #316