fix remarks by kehoste