Partial fix to off diag problem.