Fix for machines without ids