issue #20734: Have to have detail nested to ensure it is always fresh.
issue #20734: Fix math problems