Fixes issue #14