The previous code was causing silent exceptions in some particular
cases. Passing through a temporary works well.

Change-Id: I71a9a58b98b5f392da4d8a4c8d08ddc1487ec79f