fixed with find_or_create method