Fix insert (returning id) issue