fixing find_or_create issue