Fix short encore bug