fixes issue #217