Fixes max recursion warning

Fixes: bug #1184542
Change-Id: I64524cc49f0aa10e378b02cbcff05b743ffc30e0
Merge "Fixes max recursion warning"