fix lost code after merge