Fix attributes, closes #1.