This fixes issue #186