Committed wrong patch earlier - fixes issues with unique fields