bug fix from new update