Fixes issue #143