issue #29 calculcations issues