Fixed auto-generated keys issue.