Fixed problem with choose