ENT-648: change method for class loading