Bug fix: Actually USE the modified subject