Make receiver setup more reliable