WRITING-939 tweak unwind operator