classes bugfix