[#33] Fixes report invalidation, incorporates code review from @jonase