Fix multiple-class issue;