Fix minor issue
Merge branch 'develop'