temporary change: might generate some unecessary code, but could fix an error detected by the regression tests.

Signed-off-by: Kristof Szabados <Kristof.Szabados@ericsson.com>