RequestStream modification

Implements fix suggested in #1020 & #1034