Addressed issue #129, escape no longer causes odd behavior