try to fix classes...