Fixed class definition