Fix issue with wrong page