Fix for new companion@