Fixes issue #84 -- no improvement really