QAART-392 Attempt to fix the Stale Ref Exception