Hopefully a fix for issue #40

Could you confirm this is the fix?

I can't reproduce it on any SS3.x version.