Fix for new cargo parameter-passing