fixed calc issue