(#2543) - fix call stack exceeded