Fixes issue #32.