This fixes issue #66