Add missing stream handler!