Try fix calculation bug 2
Try fix calculation bug 3