Fix for nsnps>2