modify option
fix some bug