fix changed_attributes, and block