fix bug
make it work first