fixed Call Stack Overflow