fix remarks for 9bc6e35