Fixed #16 fix calculates