Fixed bug introduced with "Stack Overflow" fix