Fixes #67

Fixes #67
Merge pull request #68 from mafiglio/bug_0067

Fixes #67