Slight improvement to the fix, to ensure that things will still work in cases where only the lookup return value is edited.