FIX regression
Merge pull request #53 from thypon/master

Regression with SContext