Fixes issue #26

Fixes issue #26