Fixed #66

Fixes issue #66