Keep attributes

Oops, committed in this branch.