Fix single page issue for real this time