Fixes issue #11.