choice fixes