Fix sustain handling