fix code from last merge