Fix to test idsync piggyback