bugfix
Merge pull request #501 from emollient/master

bugfix