Bug #22 fixed FOR SOME calcs. Others still affected