Issue 6857: Fix editing the return value again doesn't work