Bugfix/cs840 fix calc develop

addresses #840 for develop branch.