fixes #7100 - better fix that addresses kiva as well.