fix bug, wish to finish :)