Fix for <class nfo>