Sbp 329

These changes shouldn't be necessary.