#493 page navigation 2 fix