Fix app not responding
Merge pull request #1694 from bootstraponline/fix_app_not_responding

Fix app not responding