fix bug finally