minor tweak on work-around