Fix data-set construction for faces