fixed so choose is used the right way