Move this call to line 93