Fix issue with TriVal ordering