Finally fixed!
Merge branch 'hotfix/1.7.9'