Fixing issue #38

This should fix issue #38