Fixed subject editing