Trying to fix stackoverflow