nota-782 almost fixed