Fixing subscription bug