fixed issue with s2 compilation