Fixes issue #13