Fixed class assignment