added proper sbdecay handling