LPS-51428 Fix racing condition
LPS-51428 Simplify the result waiting.