Added an attemp at a format tag fix. DHH-259