Fix encore + multi turn moves