LPS-47568 SF - avoid race condition