Fixing subscription issue