Fixed some bugs in SNRP for nonHD.nonHD dissociation