Big fix for numeric keys such as IDs that aren't sequential