diff --git a/projects/hip/include/hcc_detail/hip_hcc.h b/projects/hip/include/hcc_detail/hip_hcc.h
index 405e2de67c..ee8692769d 100644
--- a/projects/hip/include/hcc_detail/hip_hcc.h
+++ b/projects/hip/include/hcc_detail/hip_hcc.h
@@ -224,9 +224,6 @@ extern "C" {
 #endif
 
 typedef class ihipStream_t* hipStream_t;
-//typedef struct hipEvent_t {
-//    struct ihipEvent_t *_handle;
-//} hipEvent_t;
 
 #ifdef __cplusplus
 }
@@ -396,7 +393,7 @@ typedef LockedAccessor<ihipStreamCritical_t> LockedAccessor_StreamCrit_t;
 class ihipStream_t {
 public:
 typedef uint64_t SeqNum_t ;
-    ihipStream_t(unsigned device_index, hc::accelerator_view av, unsigned int flags);
+    ihipStream_t(ihipDevice_t *ctx, hc::accelerator_view av, unsigned int flags);
     ~ihipStream_t();
 
     // kind is hipMemcpyKind
@@ -452,7 +449,7 @@ private:
     unsigned resolveMemcpyDirection(bool srcTracked, bool dstTracked, bool srcInDeviceMem, bool dstInDeviceMem);
     void setAsyncCopyAgents(unsigned kind, ihipCommand_t *commandType, hsa_agent_t *srcAgent, hsa_agent_t *dstAgent);
 
-    unsigned                    _device_index;       // index into the g_device array 
+    ihipDevice_t  *_ctx;  // parent context that owns this stream.
 
     friend std::ostream& operator<<(std::ostream& os, const ihipStream_t& s);
 };
@@ -461,7 +458,7 @@ private:
 inline std::ostream& operator<<(std::ostream& os, const ihipStream_t& s)
 {
     os << "stream#";
-    os << s._device_index;
+    //os << s._ctx->getDeviceIndex();;  // FIXME
     os << '.';
     os << s._id;
     return os;
@@ -599,7 +596,7 @@ public: // Data, set at initialization:
     hsa_agent_t             _hsa_agent;    // hsa agent handle
 
     // The NULL stream is used if no other stream is specified.
-    // NULL has special synchronization properties with other streams.
+    // Default stream has special synchronization properties with other streams.
     ihipStream_t            *_default_stream;
 
 
diff --git a/projects/hip/src/hip_hcc.cpp b/projects/hip/src/hip_hcc.cpp
index b4796d006f..3640cf45b8 100644
--- a/projects/hip/src/hip_hcc.cpp
+++ b/projects/hip/src/hip_hcc.cpp
@@ -128,11 +128,11 @@ ihipSignal_t::~ihipSignal_t()
 // ihipStream_t:
 //=================================================================================================
 //---
-ihipStream_t::ihipStream_t(unsigned device_index, hc::accelerator_view av, unsigned int flags) :
+ihipStream_t::ihipStream_t(ihipDevice_t *ctx, hc::accelerator_view av, unsigned int flags) :
     _id(0), // will be set by add function.
     _av(av),
     _flags(flags),
-    _device_index(device_index)
+    _ctx(ctx)
 {
     tprintf(DB_SYNC, " streamCreate: stream=%p\n", this);
 };
@@ -294,7 +294,7 @@ ihipDevice_t * getDevice(unsigned deviceIndex)
 //---
 ihipDevice_t * ihipStream_t::getDevice() const
 {
-    return ::getDevice(_device_index);
+    return _ctx;
 };
 
 #define HIP_NUM_SIGNALS_PER_STREAM 32
@@ -520,7 +520,7 @@ void ihipDevice_t::locked_reset()
 
 
     // Create a fresh default stream and add it:
-    _default_stream = new ihipStream_t(_device_index, _acc.get_default_view(), hipStreamDefault);
+    _default_stream = new ihipStream_t(this, _acc.get_default_view(), hipStreamDefault);
     crit->addStream(_default_stream);