Fixed call-by-reference problem

Change-Id: I7b2de5f0442f079f4fc2452399c1bb9235951d3c