Report is now properly computing