Fix lost attributes. Close #121