Correction of a major bug