API Changes, Fixed StackOverflowError