Fixes issue #130.