[BUG] keeping fixing bug