Fix multi page handling