Fixing for later automakes.