Revert "Improvement of escape method"

This reverts commit bbad404bbc85486847b5583f8b324405c4a8f9d8.