Fix subjectshit