Fixed bug (papercut) 1133563.
Merge pull request #80 from snwh/master

Fixed bug (papercut) 1133563.