Fixed bug z StackOverflow