Fixed Stack Overflow Issue