fixed includes and unescaped characters