Actually fixes #7072
Part 2 of subject problem, fixes #7072
Part 3 of subject problem, fixes #7072