[Finish #62498740] Workaround for unpredictable indicators