Tweak format to fix highlight