Touchups to rns fix: github issue #117