This fixes issue #27