Make thbc and thbcw less irritating