Value Escaping Fix