Fixes #5511: conservative modification