This commit is for diagnostics.