Should fix stackoverflow error