fix first page flow bug