this finally fixes issue #8