fix #25444 and #25417 to be more clsoe to the format specs when usign
kolab3