Fixes issue #12.