Fixed Affected()
Merge branch 'develop'