PM_Subject needs fix