Moved placement of stream_features fix