Fix #63 stream