Bugfix: forgot to use new format function