bug fix (未完