Fix issue with the data-xxx variables.