fixed s2 issue