Fix support for raw formatter