further fix complexity issue