tomsontom fix return for Diagnostic