Fix crashing issue with complexity > 1