fixed classes and error