issue22: fix broken highlighting