complexity issue fix