Fixes issue #40