Fix attribute error
Merge branch 'develop'