fix bug, working