#5107 modify the format