conditional update #399