Fixes issue #12