-fiexd some bugs