fixed a calculation error
merge