Fix issue with getting heat outputs

Change-Id: I83945788c37fad98a90b36edc5abfac718ffcc0e