attempt to fix s2w