this fixes issue #21