Fixed te error of the not loading class
Merge branch 'hotfix/fix-wrong-assertion-to-nda'