Fix    q >= noda