I think that to remove an hack is acceptable to output some more data. :P

Signed-off-by: emanuele <emanuele45@gmail.com>