still fix bug