Started fixing StackOverflowError