Add additional fix for non auto incremental primary keys