Fixes issue #66.