Hopefully fix stack overflow