Improve workaround for do_image_wic race condition