adapt to the very last changes to the ABI