FISH: Hotfix #3

Fixed some Endless Mode issues.