Fixes issue #24