Next compilation fix