PLA-797 fix recursion problem