Bugfix: prev/next navigation doesn't work