fixed StackOverflow