[fixup] scoped lock + removed condition