fix complexity bug
Merge branch 'develop'