fix handler stream