Handle N=1 and some other cases