Fix attributes in right spot