Fix after merge with develop.