Fix #8117 - another go at thousand seperator