Fix/subject deltas