Fix for removal of data attributes durring patch operations