issue with add_class empty_unit is fixed