Oops - forgot something in last commit.

Now it works :). Tested with ssb too.