Another sustain bugfix