Fix CurrentPageIsValid