XX-10939 Forgot to not set id by hand