I am working on fixing this at the formatter level.
Patch ready soon...