Fixed streaming (closes #133)