Previous commit introduced issue where subjects weren't being set