fixed wrong require call in some classes