This fixes issue #12