Bug/uv nan 74038490

Related ticket : https://www.pivotaltracker.com/story/show/74038490