Fixes issue #133