BUGFIX: class add .