fix remarks by piojo