ticket:6 fix some remarks