Fixes issue #155.