Fix with sequence switching