Fixing additional class issue