Fixes issue #46

Fixes issue #46