fixes issue #16