Update per Samuel Neves comments.