Fixed code for missing attrs that were lost