Fix matrix and single_value