Fix bug.
Merge pull request #447 from gsn/master

Fix bug.