Fix bug first page - do not necessary have a second page