fixed flaw on page one flow