editing issue #2095