Fix for deadlock in push path

Passed tst in bc; poc in bc ran two times but still is not guaranteed. Next week should test poc and standard cc tests. Anyway no harm in merging now (as poc in bc doesn't run well anyway without this fix).