Added fix for no data in stdout/err