Fixed Next/Previous bug

334-369