blame Ema :P
Merge pull request #484 from eurich/ssi_fixes

blame Ema :P