Fix bug with the fall performance
Merge branch 'develop'