Fixes issue #15