LERGO-268

 implementing fix for report as well.