Fixes issue #18