2.0: correction after merge