Fix to set class