bugfix + subject metadata