Fixed so that get_value_field works properly