Compatability fix for SS3.0.5

I created a sidebranch for SS3.0.5 and made a small change to make it all work well together.

Thnx for the nice work :)