add calculator, fix #118177
Merge pull request #118493 from mauk81/patch-6

add calculator, fix #118177