fixes #1313: Finishes up fixes by adding subjects.