Fix stack overflow

MA-276 #done

Change-Id: I94aef21efeb236fcbdc5e0a7ace2a3188bbdd2ee
1 file changed