fixes issue #41