repair the code lost from last merge