Made a workaround for Issue#457 to prevent from StackOverflowError