fixed issue from page_nagigation