Next episode doesn't show correct episode (skips episodes)

[Pandorica-Opens]

Hi all,

So I'm having this slightly frustrating issue that I can't seem to solve.

I'm using the Jellyfin Android TV client on an Nvidia Shield. With some shows, when you click into an episode's description, and there's a bar at the bottom showing the next few episodes, the episode furthest to the left (which should be the immediate next episode) is sometimes off by one, two or even three episodes.

So for example, this is an issue I'm having right now with Pokemon. If I'm on episode 41, according the bar, the next episode is episode 44, when it should be 42.

Now, with Pokemon, I was having issues with the episodes not matching up with what Jellyfin thought they were. It turned out Jellyfin was using the metadata from the Japanese version, which has more episodes than the English version. After changing the episode names to match whats on TMDB the episodes now match up. Is it possible it's something to do with that? 

I've scanned, rescanned, replaced metadata, removed and re-added the show, but it doesn't seem to change this behaviour.

Thanks!