the s2 fix
Merge pull request #225 from K-McK/sr_dev

the s2 fix