fixing escapes