Fix issue causing multiple calls in same run to fail