Fix premature escaping problem