changed default_values conditional