Fix attributes selection