fixed escapi