bug fix from yi