Fix final attributes