Some bugfix for SBS