fixed find or create bug