Fix issue with sbc, improve support for 1.5.8