adapt handling of side_streams