Fixes issue #131