Fix for working with s2