Fix complexity issue