probably fixed calc issue