Fix #215 escape loop
Merge pull request #217 from bootstraponline/fix_loop

Fix #215 escape loop