Fixed the StackOverflow problem (finally\!)