Fix end of page world problem