fix s2 bug