Class fixing