more fix on picking

more fix on picking