Adding code to try to repro #147