Fixes issue #129