Fixes issue #11