fixes issue #20