This fixes issue #190