fix first_or_create call