Fix for issue #83

These changes fix the issue #83