Try fix calculation bug