Fixes issue #17