Fix the return of Nwords to include the state