Fixed a major bug with SPB