Fix best value

https://www.pivotaltracker.com/n/projects/877197/stories/80351182