Fix attributes bug