Fixing subscription functions