fiexd some bug