Fix find or create issue