Fix current_values not being written out