Fixed issue with output handler decide what to send.