Hopefully improving reliability of TOM and TOS reporting.