issues 74/77 fix

Wrong timestamps in stream