modal bug fix
Merge branch 'develop'