Fixed first set errors