Fixed StackOverflowError (hopefully..)