tested and fixed order_domain_values