Fixed the bug with page issue