Fix data variables;