bug fix for previous commit
Merge branch 'develop'