Issue #5: ensure that we reset our static variables