minor bugfix/upgrade to NIST