fixes issue #24