remove some calculation bugs