Fix a StackOverflow