fix bug, too