Fixes issue #71.