Fix issue #71

Fixes issue $71