Fix page one issue