Temporary fix for find_or_create_by