Fixed Choose bug