Fixed missing escaping