feature select
fix bug