Fixes issue #145