[Stream] Removed dupplicated logic