Fixes issue #25.