Fix for data attributes