Fixes issue #23