fix modal stuff
Merge pull request #880 from ahomatthew/develop

fix modal stuff