Fix page indexing