Bugfix: report rewriting fixed