Next prev hotfix