code highlight issue fix