fixed endless page issue