fix to psq5 routine which supports either order, and CG_1