fix s2s