fix find_or_create_by in #630