Fix context bug

Change-Id: I1269493ed8754edb9b92c514b7ad8d2ebc0dc5a3