(#1156) - prevent 'to much recursion' error