Fixed style after merge 0.316