Fixed single page bug