This fixes issue #184