fix
 merge kxs's style
fix