[Fix] Drop-level and class issue