Less than escaping fix...