Fixed Class unloading issue