Repaired last irregularities