Bugfix/cs840 fix calc rebased

addresses #840 (c.f. #862)