bugfixes to NISTO