Added checks for subject being active