[fixed] infinite recursion

Change-Id: Ie839f1d0e41cc7a5b1ca2acf1a982ea8b99669d3
Merge "[fixed] infinite recursion" into unstable